From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 20 Jul 2026 14:41:57 +0000 (+0100)
Subject: Merge version 25.0.7-2+rpi1 and 25.0.7-2+deb13u1 to produce 25.0.7-2+rpi1+deb13u1
X-Git-Tag: archive/raspbian/25.0.7-2+rpi1+deb13u1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=379c03a6a3b878b3eed9426d3f6e91eb0cc87626;p=mesa.git

Merge version 25.0.7-2+rpi1 and 25.0.7-2+deb13u1 to produce 25.0.7-2+rpi1+deb13u1
---

379c03a6a3b878b3eed9426d3f6e91eb0cc87626
diff --cc debian/changelog
index 122bee225,dc70f3ff9..673e6f996
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,19 @@@
- mesa (25.0.7-2+rpi1) trixie-staging; urgency=medium
++mesa (25.0.7-2+rpi1+deb13u1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 24.0.7-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 24 May 2024 10:55:59 +0000]
 +  * Try to disable valgrind.
 +  * Move valgrind from build-depends to build-conflicts.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 29 Aug 2025 00:48:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 20 Jul 2026 14:41:57 +0000
++
+ mesa (25.0.7-2+deb13u1) trixie; urgency=high
+ 
+   * Non-maintainer upload by the LTS Team.
+   * Backport patch for CVE-2026-40393:
+     - backport support function STACK_ARRAY, cherry-pick file from upstream.
+     - backport commits fixing the issue
+ 
+  -- Tobias Frost <tobi@debian.org>  Fri, 19 Jun 2026 21:20:06 +0200
  
  mesa (25.0.7-2) unstable; urgency=medium